From 6fdf1e4462e1a69995bdcd71aa9de1071216b3f6 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Tue, 8 Mar 2016 16:06:55 +0100
Subject: [PATCH] Adwaita: path-bar style fixes

what we used to do here doesn't really work anymore, so this adapt
to gtk+ and theme changes.
---
 gtk/theme/Adwaita/_common.scss           | 22 ++++++++++++++--------
 gtk/theme/Adwaita/gtk-contained-dark.css | 23 +++++++++++++----------
 gtk/theme/Adwaita/gtk-contained.css      | 23 +++++++++++++----------
 3 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index f8ac614331..5c55df6a34 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1390,17 +1390,23 @@ headerbar {
  * Pathbars *
  ************/
 .path-bar button {
-  &:only-child {
-    padding-left: 12px;
-    padding-right: 12px;
+  &.text-button, &.image-button, & {
+    padding-left: 4px;
+    padding-right: 4px;
   }
 
-  // the following is for spacing the icon and the label inside the home button
-  & label:last-child { padding-left: 2px; }
-  & label:first-child { padding-right: 2px; }
-  & label:only-child { padding-right: 0; padding-left: 0; }
-}
+  &.text-button.image-button label { padding-left: 0; padding-right: 0; }
 
+  &.text-button.image-button, & {
+    label:last-child { padding-right: 8px; }
+    label:first-child { padding-left: 8px; }
+  }
+
+  image {
+    padding-left: 4px;
+    padding-right: 4px;
+  }
+}
 
 /**************
  * Tree Views *
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 722b69fa9f..7ecd0e3d78 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1734,16 +1734,19 @@ window.csd > .titlebar:not(headerbar) {
 /************
  * Pathbars *
  ************/
-.path-bar button:only-child {
-  padding-left: 12px;
-  padding-right: 12px; }
-.path-bar button label:last-child {
-  padding-left: 2px; }
-.path-bar button label:first-child {
-  padding-right: 2px; }
-.path-bar button label:only-child {
-  padding-right: 0;
-  padding-left: 0; }
+.path-bar button.text-button, .path-bar button.image-button, .path-bar button {
+  padding-left: 4px;
+  padding-right: 4px; }
+.path-bar button.text-button.image-button label {
+  padding-left: 0;
+  padding-right: 0; }
+.path-bar button.text-button.image-button label:last-child, .path-bar button label:last-child {
+  padding-right: 8px; }
+.path-bar button.text-button.image-button label:first-child, .path-bar button label:first-child {
+  padding-left: 8px; }
+.path-bar button image {
+  padding-left: 4px;
+  padding-right: 4px; }
 
 /**************
  * Tree Views *
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 1dcf89c04b..4e4a32f191 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1738,16 +1738,19 @@ window.csd > .titlebar:not(headerbar) {
 /************
  * Pathbars *
  ************/
-.path-bar button:only-child {
-  padding-left: 12px;
-  padding-right: 12px; }
-.path-bar button label:last-child {
-  padding-left: 2px; }
-.path-bar button label:first-child {
-  padding-right: 2px; }
-.path-bar button label:only-child {
-  padding-right: 0;
-  padding-left: 0; }
+.path-bar button.text-button, .path-bar button.image-button, .path-bar button {
+  padding-left: 4px;
+  padding-right: 4px; }
+.path-bar button.text-button.image-button label {
+  padding-left: 0;
+  padding-right: 0; }
+.path-bar button.text-button.image-button label:last-child, .path-bar button label:last-child {
+  padding-right: 8px; }
+.path-bar button.text-button.image-button label:first-child, .path-bar button label:first-child {
+  padding-left: 8px; }
+.path-bar button image {
+  padding-left: 4px;
+  padding-right: 4px; }
 
 /**************
  * Tree Views *
-- 
2.30.2